Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 30 Dec 2011 05:28:58 +0000 (21:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 30 Dec 2011 05:28:58 +0000 (21:28 -0800)

Trivial merge